From 6e1544ff09a4a66d8a923616414204840f649a6f Mon Sep 17 00:00:00 2001
From: "cl349@arcadians.cl.cam.ac.uk" <cl349@arcadians.cl.cam.ac.uk>
Date: Wed, 24 Nov 2004 13:37:40 +0000
Subject: [PATCH] bitkeeper revision 1.1159.187.5
 (41a48ea4noDXAKVgDzH9BvR43D1OQg)

Simplify includes.
---
 xen/arch/x86/i8259.c              | 1 +
 xen/include/asm-x86/x86_32/regs.h | 2 --
 xen/include/xen/keyhandler.h      | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/xen/arch/x86/i8259.c b/xen/arch/x86/i8259.c
index d130c623df..62eb07ada0 100644
--- a/xen/arch/x86/i8259.c
+++ b/xen/arch/x86/i8259.c
@@ -7,6 +7,7 @@
 
 #include <xen/config.h>
 #include <xen/init.h>
+#include <xen/types.h>
 #include <asm/regs.h>
 #include <xen/errno.h>
 #include <xen/sched.h>
diff --git a/xen/include/asm-x86/x86_32/regs.h b/xen/include/asm-x86/x86_32/regs.h
index fcf1cd5e6b..a4fdcc663a 100644
--- a/xen/include/asm-x86/x86_32/regs.h
+++ b/xen/include/asm-x86/x86_32/regs.h
@@ -1,8 +1,6 @@
 #ifndef _I386_REGS_H
 #define _I386_REGS_H
 
-#include <xen/types.h>
-
 struct xen_regs
 {
     /* All saved activations contain the following fields. */
diff --git a/xen/include/xen/keyhandler.h b/xen/include/xen/keyhandler.h
index e3d49c9086..3c7c36ef66 100644
--- a/xen/include/xen/keyhandler.h
+++ b/xen/include/xen/keyhandler.h
@@ -10,7 +10,7 @@
 #ifndef __XEN_KEYHANDLER_H__
 #define __XEN_KEYHANDLER_H__
 
-#include <asm/regs.h>
+struct xen_regs;
 
 /*
  * Register a callback function for key @key. The callback occurs in
-- 
2.30.2